From 619ecf8400cbc1540d9f07c317a8e2d6782c5752 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 1 Sep 2015 16:51:44 +0200 Subject: [PATCH] x86/mm: make {set,clear}_identity_p2m_mapping() work for PV guests Namely Dom0 suffers from commit 5ae03990c1 ("xen/vtd: create RMRR mapping") having removed the creation of such mappings for non- translated guests. Reported-by: Malcolm Crossley Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: George Dunlap Release-acked-by: Wei Liu --- xen/arch/x86/mm/p2m.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 8fa918b827..b2726bd1e9 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -957,7 +957,11 @@ int set_identity_p2m_entry(struct domain *d, unsigned long gfn, int ret; if ( !paging_mode_translate(p2m->domain) ) - return 0; + { + if ( !need_iommu(d) ) + return 0; + return iommu_map_page(d, gfn, gfn, IOMMUF_readable|IOMMUF_writable); + } gfn_lock(p2m, gfn, 0); @@ -1028,7 +1032,11 @@ int clear_identity_p2m_entry(struct domain *d, unsigned long gfn) int ret; if ( !paging_mode_translate(d) ) - return 0; + { + if ( !need_iommu(d) ) + return 0; + return iommu_unmap_page(d, gfn); + } gfn_lock(p2m, gfn, 0); -- 2.30.2